Auto merge of #1291 - alexcrichton:issue-1083, r=huonw
authorbors <bors@rust-lang.org>
Tue, 24 Feb 2015 17:13:58 +0000 (17:13 +0000)
committerbors <bors@rust-lang.org>
Tue, 24 Feb 2015 17:13:58 +0000 (17:13 +0000)
Hopefully this will help diagnose #1083


Trivial merge